Skip to content

Antalya 25.8 Backport of #131963 - Clear --jwt and the other credential options from the command line of clickhouse-client and clickhouse-keeper-client - #2935

Draft
blau-ai wants to merge 2 commits into
antalya-25.8from
backports/antalya-25.8/131963
Draft

blau-ai wants to merge 2 commits into
antalya-25.8from
backports/antalya-25.8/131963

Conversation

@blau-ai

@blau-ai blau-ai commented Nov 20, 2026

Copy link
Copy Markdown
Collaborator

Changelog category (leave one):

  • Improvement

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):

clickhouse-client now clears the values of --jwt, --ssh-key-passphrase, --one-time-password and --oauth-client-secret from its command line, as it already did for --password, so they are no longer visible in ps and /proc/<pid>/cmdline. clickhouse-keeper-client now does the same for --password and --identity. Closes ClickHouse#131191. (ClickHouse#131963 by @groeneai)

Documentation entry for user-facing changes

...

CI/CD Options

Exclude tests:

  • Fast test
  • Integration Tests
  • Stateless tests
  • Stateful tests
  • Unit tests
  • Performance tests
  • Aarch64 tests
  • All with ASAN
  • All with TSAN
  • All with MSAN
  • All with UBSAN
  • All with Coverage
  • All Regression
  • Disable CI Cache

Regression jobs to run:

  • Fast suites (mostly <1h)
  • Aggregate Functions (2h)
  • Alter (1.5h)
  • Benchmark (30m)
  • CAS (content-addressed storage; Antalya only)
  • ClickHouse Keeper (1h)
  • Iceberg (2h)
  • LDAP (1h)
  • OAuth (5m)
  • Parquet (1.5h)
  • RBAC (1.5h)
  • SSL Server (1h)
  • S3 (2h)
  • S3 Export (2h)
  • Swarms (30m)
  • Tiered Storage (2h)

PedroTadim and others added 2 commits November 20, 2026 12:51
…ptions-from-command-line

Clear `--jwt` and the other credential options from the command line of `clickhouse-client` and `clickhouse-keeper-client`

Conflicts committed as-is, conflict markers included:
- programs/keeper-client/KeeperClient.cpp (both modified)
Resolved the keeper-client include conflict and trimmed the test to the options antalya-25.8 supports.
@blau-ai

blau-ai commented Nov 20, 2026

Copy link
Copy Markdown
Collaborator Author

Port-AL: cherry-pick conflicts resolved by AI

Conflicted files:

  • programs/keeper-client/KeeperClient.cpp (both modified)

Commits:

  • 4325310: cherry-pick with the conflicts committed as-is

  • 8de1b29: resolution

  • programs/keeper-client/KeeperClient.cpp: the include block conflicted. I kept only Common/clearPasswordFromCommandLine.h and the clearPasswordFromCommandLine(argc, argv) call after client.init.

  • src/Common/clearPasswordFromCommandLine.cpp: the new secret-option list is kept as-is. --one-time-password and --oauth-client-secret don't exist in antalya-25.8, so they're harmless extras.

  • Test 05813_clear_credentials_from_command_line: removed the options that don't exist on this branch (--one-time-password, --oauth-client-secret) and the spaced-= client section, and updated the reference.

@github-actions

Copy link
Copy Markdown

Workflow [PR], commit [8de1b29]

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants